cFE Integration candidate: 2021-04-02 #1279
Merged
+14
−11
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes mislabeled function in v6.8.0-rc1+dev484 change description
The `PspConfig` member is removed from the `GLOBAL_CONFIGDATA` object. Updates the only remaining ref to this object inside the CFE_PSP_VERSION macro to use the API function instead. This also updates the OSAL and CFE version print to _not_ depend on the global object too - OSAL becomes an API call and CFE can just use the macro directly because its the same library (itself) so no linking concern/issue.
Fix #1273, remove PspConfig global object
Fix #1277, ZeroCopy typo in ReadMe
astrogeco
changed the title
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Apr 2, 2021
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Apr 2, 2021
*Submodule ICs:* nasa/cFE#1279, nasa/PSP#288 *Submodule IC Contents:* nasa/cFE#1274 - Fix #1273, remove PspConfig global object nasa/cFE#1278 - Fix #1277, ZeroCopy typo in ReadMe nasa/PSP#287 - Fix #280, remove psp configdata global object nasa/PSP#283 - Fix #281, cleanup memory range table
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Apr 2, 2021
*Submodule ICs:* nasa/cFE#1279, nasa/PSP#288 *Contents:* nasa/cFE#1274 - Fix #1273, remove PspConfig global object nasa/cFE#1278 - Fix #1277, ZeroCopy typo in ReadMe nasa/PSP#287 - Fix #280, remove psp configdata global object nasa/PSP#283 - Fix #281, cleanup memory range table
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Apr 2, 2021
*Submodule ICs:* nasa/cFE#1279, nasa/PSP#288 *Contents:* nasa/cFE#1274 - Fix #1273, remove PspConfig global object nasa/cFE#1278 - Fix #1277, ZeroCopy typo in ReadMe nasa/PSP#287 - Fix #280, remove psp configdata global object nasa/PSP#283 - Fix #281, cleanup memory range table
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Change Description and Impacts
PR #1274
Fix #1273, remove PspConfig global object
Removes
PspConfigmember from theGLOBAL_CONFIGDATAobject. Updates the only remaining reference to this object inside theCFE_PSP_VERSIONand uses the new Version API instead. Updates the OSAL version print to use the version API call and CFE uses the macro directly.PR #1278
Fix #1277, ZeroCopy typo in ReadMe.md
Replaces duplicate mention of the removed
CFE_SB_ZeroCopyGetPtrwith the correct removal target ofCFE_SB_ZeroCopyReleasePtrTests
cfe https://github.com/nasa/cFE/pull/1279/checks
bundle https://github.com/nasa/cFS/pull/233/checks
Additional Context
Part of nasa/cFS#233
Authors
@jphickey
@astrogeco